Merge branch 'master' of git://git.denx.de/u-boot-mips
authorTom Rini <[email protected]>
Sun, 12 Jun 2016 16:52:19 +0000 (12:52 -0400)
committerTom Rini <[email protected]>
Sun, 12 Jun 2016 16:52:19 +0000 (12:52 -0400)

Trivial merge